[json-c] update to 0.17 2023-08-12 by jswillard · Pull Request #34381 · microsoft/vcpkg

jswillard · 2023-10-09T19:42:11Z

Changes comply with the maintainer guide
SHA512s are updated for each updated download
The "supports" clause reflects platforms that may be fixed by this new version
Any fixed CI baseline entries are removed from that file.
Any patches that are no longer applied are deleted from the port's directory.
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

MonicaLiu0311 · 2023-10-10T04:11:40Z

clamav depends on json-c: ports/clamav/vcpkg.json#L10.

FAILED: libclamav/CMakeFiles/regex.dir/regex/regerror.c.obj 
C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1437~1.328\bin\Hostx64\x64\cl.exe   -DHAVE_CONFIG_H -DHAVE_STRUCT_TIMESPEC -DWIN32_LEAN_AND_MEAN -ID:\installed\x64-windows\include\libxml2 -ID:\buildtrees\clamav\x64-windows-dbg\libclamav -ID:\buildtrees\clamav\src\av-0.103.0-0a88d9c7f3.clean\libclamunrar_iface -ID:\buildtrees\clamav\src\av-0.103.0-0a88d9c7f3.clean\libclamav\.. -ID:\buildtrees\clamav\src\av-0.103.0-0a88d9c7f3.clean\win32\compat -ID:\buildtrees\clamav\x64-windows-dbg -ID:\buildtrees\clamav\src\av-0.103.0-0a88d9c7f3.clean\libclamav -external:ID:\installed\x64-windows\include -external:ID:\installed\x64-windows\include\json-c -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /MP  /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /Folibclamav\CMakeFiles\regex.dir\regex\regerror.c.obj /Fdlibclamav\CMakeFiles\regex.dir\ /FS -c D:\buildtrees\clamav\src\av-0.103.0-0a88d9c7f3.clean\libclamav\regex\regerror.c
D:\installed\x64-windows\include\json-c\json_inttypes.h(34): error C2628: 'SSIZE_T' followed by 'int' is illegal (did you forget a ';'?)

MonicaLiu0311 · 2023-10-10T04:12:17Z

Note: I will be converting your PR to draft status. When you're ready, please revert to "ready for review".

jswillard · 2023-10-10T19:07:03Z

clamav has since been updated to fix compatibility with the latest version of json-c, see Cisco-Talos/clamav#1002 - what is the preferred way of handling this? Should I submit a separate PR updating clamav to version 1.2.0, which includes that pr fixing this issue?

MonicaLiu0311 · 2023-10-11T06:54:58Z

clamav has since been updated to fix compatibility with the latest version of json-c, see Cisco-Talos/clamav#1002 - what is the preferred way of handling this? Should I submit a separate PR updating clamav to version 1.2.0, which includes that pr fixing this issue?

You need to update both clamav and json-c in this PR to ensure that they are installed successfully, thank you.

MonicaLiu0311 · 2023-10-19T02:52:28Z

Ping @jswillard Any progress here?

val-ms · 2023-10-20T21:49:55Z

As a heads up we're backporting the clamav - json-0.17 compatibility fix for 1.1 and 1.0 (just merged the fix a bit ago) and will be publishing the new versions sometime next week if all goes well. You're of course welcome to upgrade to 1.2 instead of 1.0 but thought I may as well mention it since @jswillard asked about updating clamav to 1.2.0. Also we'll be publishing 1.2.1 next week in addition.

ports/clamav/vcpkg.json

versions/c-/clamav.json

jswillard · 2023-11-08T23:42:34Z

I added two more commits removing the extraneous port version for clamav

MonicaLiu0311 · 2023-11-10T07:12:56Z

The usage test passed on x64-windows (header files found):

json-c provides CMake targets:

  # this is heuristically generated, and may not be correct
  find_package(json-c CONFIG REQUIRED)
  target_link_libraries(main PRIVATE json-c::json-c json-c::json-c-static)

dg0yt · 2023-11-10T07:24:41Z

If the suggest usage is:

target_link_libraries(main PRIVATE json-c::json-c json-c::json-c-static)

then we need an explicit usage file.
And reviewers who realize that.

MonicaLiu0311 · 2023-11-17T04:01:30Z

The usage test passed on x64-windows and x64-windows-static (header files found):

json-c provides CMake targets:

  # this is heuristically generated, and may not be correct
  find_package(json-c CONFIG REQUIRED)
  target_link_libraries(main PRIVATE json-c::json-c)

ports/json-c/portfile.cmake

data-queue · 2023-11-17T22:35:37Z

ports/clamav/isnt.patch

+         "dll.hpp" )
+ if(WIN32)
+     set_target_properties(clamunrar PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+    target_sources( clamunrar PRIVATE "isnt.cpp")


Can you submit this patch upstream?

Upstream (1.2.1) is much ahead of this port (0.103.11) and has similar code since 1.0.
Cisco-Talos/clamav@e60843a

@jswillard Would you like to update clamav to the latest version 1.2.1?

MonicaLiu0311 · 2023-12-29T03:01:43Z

Is there any new progress?

MonicaLiu0311 · 2024-01-26T03:23:46Z

/azp run

azure-pipelines · 2024-01-26T03:23:55Z

Azure Pipelines successfully started running 1 pipeline(s).

data-queue · 2024-02-01T21:43:20Z

@jswillard still working on this?

jswillard · 2024-02-05T22:13:54Z

I'm not sure what work still needs to be done here. json-c is updated and the builds are passing status checks. I would prefer not to update clamav to 1.2.1 since I am only interested in json-c being updated. If what's blocking this pr is that patch to clamav, I can go ahead and submit a pr to clamav to get it changed upstream.

MonicaLiu0311 · 2024-02-06T02:39:02Z

If what's blocking this pr is that patch to clamav, I can go ahead and submit a pr to clamav to get it changed upstream.

If the latest upstream version has a similar fix, reporting this patch to the upstream may not get a response.

I'm not sure what work still needs to be done here. json-c is updated and the builds are passing status checks. I would prefer not to update clamav to 1.2.1 since I am only interested in json-c being updated.

OK, I understand what you mean and will mark it as info:reviewed.

* [json-c] update to version 0.17 2023-08-12 * [json-c] update version database * [clamav] update to version 0.103.11 * [clamav] update version db * [clamav] add patch to compile isnt.cpp on windows * [clamav] update version db * [clamav] remove extra port version * [clamav] update version db * fix cmakelists.txt * update version * fix cmakelists.txt * update git-tree * remove fix-cmakelists.patch * update git-tree * format * update git-tree --------- Co-authored-by: Monica <[email protected]>

jswillard added 2 commits October 9, 2023 13:40

[json-c] update to version 0.17 2023-08-12

b1e8ff6

[json-c] update version database

ea9043c

JonLiu1993 assigned MonicaLiu0311 Oct 10, 2023

MonicaLiu0311 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 10, 2023

MonicaLiu0311 marked this pull request as draft October 10, 2023 04:12

jswillard added 4 commits November 6, 2023 10:52

[clamav] update to version 0.103.11

6abf901

[clamav] update version db

4a41fbf

[clamav] add patch to compile isnt.cpp on windows

f10e0d5

[clamav] update version db

6fac46c

jswillard marked this pull request as ready for review November 7, 2023 17:46

MonicaLiu0311 reviewed Nov 8, 2023

View reviewed changes

ports/clamav/vcpkg.json Outdated Show resolved Hide resolved

MonicaLiu0311 reviewed Nov 8, 2023

View reviewed changes

versions/c-/clamav.json Outdated Show resolved Hide resolved

jswillard added 2 commits November 8, 2023 16:40

[clamav] remove extra port version

e288856

[clamav] update version db

f8fec05

MonicaLiu0311 previously approved these changes Nov 10, 2023

View reviewed changes

MonicaLiu0311 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Nov 10, 2023

MonicaLiu0311 removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Nov 10, 2023

Monica added 2 commits November 16, 2023 02:38

fix cmakelists.txt

c26e6a8

update version

98605f0

MonicaLiu0311 dismissed their stale review via 98605f0 November 16, 2023 10:47

fix cmakelists.txt

431c563

update git-tree

a583aea

dg0yt reviewed Nov 17, 2023

View reviewed changes

ports/json-c/portfile.cmake Outdated Show resolved Hide resolved

Monica added 4 commits November 16, 2023 22:06

remove fix-cmakelists.patch

5c308e7

update git-tree

84b3147

format

97da471

update git-tree

6d87960

MonicaLiu0311 approved these changes Nov 17, 2023

View reviewed changes

MonicaLiu0311 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Nov 17, 2023

data-queue reviewed Nov 17, 2023

View reviewed changes

data-queue marked this pull request as draft November 17, 2023 22:36

MonicaLiu0311 removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Nov 20, 2023

jswillard marked this pull request as ready for review February 5, 2024 22:14

Merge branch 'master' of https://github.com/microsoft/vcpkg

085d812

MonicaLiu0311 approved these changes Feb 6, 2024

View reviewed changes

MonicaLiu0311 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Feb 6, 2024

data-queue merged commit 3975146 into microsoft:master Feb 6, 2024

Conversation

jswillard commented Oct 9, 2023

Uh oh!

MonicaLiu0311 commented Oct 10, 2023

Uh oh!

MonicaLiu0311 commented Oct 10, 2023

Uh oh!

jswillard commented Oct 10, 2023

Uh oh!

MonicaLiu0311 commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MonicaLiu0311 commented Oct 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

val-ms commented Oct 20, 2023

Uh oh!

Uh oh!

Uh oh!

jswillard commented Nov 8, 2023

Uh oh!

MonicaLiu0311 commented Nov 10, 2023

Uh oh!

dg0yt commented Nov 10, 2023

Uh oh!

MonicaLiu0311 commented Nov 17, 2023

Uh oh!

Uh oh!

data-queue Nov 17, 2023

Choose a reason for hiding this comment

Uh oh!

dg0yt Nov 18, 2023

Choose a reason for hiding this comment

Uh oh!

MonicaLiu0311 Nov 20, 2023

Choose a reason for hiding this comment

Uh oh!

MonicaLiu0311 commented Dec 29, 2023

Uh oh!

MonicaLiu0311 commented Jan 26, 2024

Uh oh!

azure-pipelines bot commented Jan 26, 2024

Uh oh!

data-queue commented Feb 1, 2024

Uh oh!

jswillard commented Feb 5, 2024

Uh oh!

MonicaLiu0311 commented Feb 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MonicaLiu0311 commented Oct 11, 2023 •

edited

Loading

MonicaLiu0311 commented Oct 19, 2023 •

edited

Loading